Merge "Tweaking clings in response to usability testing. (5057945, 5056643)" into ics-factoryrom