Merge changes from topic "device_config_for_display_qpr1" into qt-qpr1-dev am: 30e9250f19
am: 7adf3f0109

Change-Id: Ia17a834fa382f31ca30a8df50063554dea0859b0