Merge "DO NOT MERGE Dismiss system dialog" into qt-qpr1-dev am: e59b568ac4

Change-Id: I00b2a53fc76f3a64f307617b7b448191a71f9b5a