Merge "Add log metrics for Aware Display Settings"