Merge "Bug fix so touching warning icon does not move the edit cursor. am: e2f29e0a am: 4d5a3e04 am: 42605ce0 am: 59f1f298 am: 14423e81 am: c20aa880" into nyc-mr2-dev-plus-aosp am: 5d86c882 Change-Id: Ic11db6675295aa7557399baee7fa75be301d507c