Merge changes from topic "sys_win_trust_sys_display" into qt-dev am: 405804397d
am: f4ef9466c9

Change-Id: I23236830fe9a5a160d4dd911a296dad4810b3c9c