DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
am: f73d085395

Change-Id: I6d17a74e4030e20b7a08516d0b4ec90e31930c66