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

* commit 'e2c92ac847d151cbf4d578ee85d3ff10126e9ada':
  Update launchFlags after changing Intent flags