Merge https://github.com/AOKP/packages_apps_Gallery2 into HEAD