Merge "surfaceflinger: silence an error for non-WCG displays"