Merge "Fail setDisplaySurface if can't enable async" into nyc-mr1-dev