Merge "Do not clear keyboard focus on touch when alwaysShowFocus is true." into devel...