Merge \"Unblock \'am start -W\' if activity is brought to front without launching\" into nyc-dev
am: 75c7cc6ca9

Change-Id: I983331f65f03d50c26b7929866e3ce5d5ae19966