Merge "surfaceflinger: disable VR mode while SELinux issues are resolved."