[automerger skipped] Merge "[DO NOT MERGE] Check property name before apply...
[automerger skipped] Merge "[DO NOT MERGE] Check property name before apply high refresh rate black list" into qt-r1-dev am: fca755bd am: 5934cffc
am: 3aa51b7c -s ours
am skip reason: subject contains skip directive
Change-Id: I4d7eef1fe87dae572a00924a9d1ad88cfb9c6e88