Merge "Update orientation on rotation changes" into sc-dev