Merge "Validate vendor display color modes" into qt-dev
am: 1da3d01b5e

Change-Id: Iad3419fbbb43177bb137c17c45b34f494d34ff8b