Merge "Fix 5134299 [UI] Select photo or album activities should have a Cancel label not x icon"