Merge "Load orientationWhenSet from disk" into main