Merge "Gallery: improve timeline loading performance" into android_ui.lnx.1.2-dev