Flag tweaking for performance and/or HWComposer fixing

Change-Id: Ib23b164ea824c5a0adc31ce59c1eb6a706fa0c27