Merge "Logically revert "Directly show the layout selection screen."" into pi-dev