Merge "Fail setDisplaySurface if can't enable async" into nyc-mr1-dev am: 4db50cec13
am: 62678121c2

Change-Id: I01e6ff77c7bc9ee0bba36d328eaf065b6a07cf35