Merge branch 'cm-12.1' of git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0

Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2