Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
am: 75bf81458e

Change-Id: I82abdf00c00d2a735e6723d8a175f152be982aff