Merge "Swap orders of GAIA signin and lock setup during Private space setup" into main