Merge "Port over surfaceflinger configurations from Floral" into qt-qpr1-dev
Change-Id: I1b97cd0eeb68104032c96dd8e6ead7599ad94ece