Fix NPEs that occur with frequent (i.e., sub-second) repeated orientation changes