Merge "Waiting for the state of views to settle after orientation change" into sc-dev