Merge "Add extra to control USER_SETUP_COMPLETE behavior."