Merge "Add flipper switch for shell transitions" into tm-dev