Merge "Fixes crash null exception on land/seascape pinned orientations"