Merge "Adding a new Edit Mode LauncherState" into udc-dev