Merge "Fix app shelf being visible during setup wizard"