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

Change-Id: I6db03bb92b73c799944764014acb31ebc3038165