Merge "Set com.android.gallery3d as the default system gallery" into rvc-dev