Merge "Remove old logic from tinting prototype" into qt-dev