Merge "Update launchFlags after changing Intent flags" into lmp-preview-dev