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

Change-Id: If4f7f84259a57231cb7f7d481dd2b25f13382780