Merge "Pass input ID to the setup/settings activity" into lmp-dev