RTC 31534: Backport CB-5398 (image picker) to 2.6 ESR