Merge "Add log metrics for Aware Display Settings" into qt-qpr1-dev