Merge "Add support for /oem/overlay" into qt-dev