Merge "Add sleep for profile saving in AppLaunch" into pi-dev