Merge "Reduce FactoryResetConfirmFragmentTest flakiness" into sc-dev