Merge "[SB][Flexi] Make KeyguardStatusBarVCTest pass regardless of scene state." into main