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

Change-Id: If5a6b1a6b3cc5a570248f7d111c37d5a09637beb