Merge "Add draw props back to greylist" into qt-dev