Merge "Introduce difference between display modes" into qt-dev
am: 53d30a91b7

Change-Id: I02e619bfb6fa23ff962d98f36286990a840e51ea