Merge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Gallery into klp-ub-dev