Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1