Revert back to AOSP Gallery