Merge "Revert change to force_dark property" into qt-dev