Merge changes from topic "check display id update" into qt-dev am: 0819556982
am: e665dc6b36

Change-Id: I476cf96033814f1cb2047fdf60fe07b211276970