Merge "[vsync] Making event not discardable" into nyc-mr1-dev
am: 454cd1ef77

Change-Id: If6cf602bca68bba65fe1c60837b4105e5b171f05