Merge changes from topic "device_config_for_display_90" into qt-r1-dev
am: 36da9bb9ff

Change-Id: Ifd67f0360cd4c4b7d48c097af3254b54384f5a6a