Merge changes from topics "displayinfocontroller", "remove_displayinfo" into rvc-dev am: 5227e844 am: 88e7e04e Change-Id: Icdd68563d8f8e19f3a8328ce7259b5b8d050f0d5