Merge "Don't allow switching after boot"