Merge "Make all unchooseable orientations update rotation on change"