Merge "SurfaceFlinger: add a backdoor to override display config" into qt-dev