Merge "Add ROTATE_SURFACE_FLINGER permission to Launcher"