Merge "Merge \\"Unblock \\'am start -W\\' if activity is brought to front without launching\\" into nyc-dev am: 75c7cc6c am: 9800ee6f" into nyc-mr1-dev-plus-aosp