Merge "Hook-up shell-transitions to DisplayChangeController rotation"