Merge "Merge "Fix missing overlay values" into qt-dev am: a2046c0576 am: 87752e9988" into qt-r1-dev-plus-aosp