Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev