Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev