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

Change-Id: If30f47511137055e2fd6076f099bbd4ca5a9275b