redo fix for MPLY-5261 'Crash can occur after continually panning the camera and rotating the environment in the orientation_v1 build on Android'. Previous fix caused assert on resume from power-lock after previously changing screen orientation. Buddy: Ian