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

Change-Id: I13e658be8b3c72ab6f6ec3c2ac1a91895cfdf66e