Merge "Add a way to suppress injected tiles for OEMs" into qt-dev