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

Change-Id: I9f9c83e619f086fc6fbf3eff3aebc5656f88bcbb