Merge "[Shell Transition] Schedule another transition to update visibility." into tm-qpr-dev