Merge "Some cleanup/rearrangement of shell transitions things"