Merge "Use SystemUI reboot UI for factory resets"