Modify OrientationRelationStore, OrientationRelationHandler