Merge "Simplify UI and animation choreography a bit" into sc-dev