Merge changes from topics "displayinfocontroller", "remove_displayinfo" am: 94c22b7194

Change-Id: I67628d868754ca3e2ab74e0b2bcb49a468ec5b2e