Merge "Fix some force_dark prop behaviors" into qt-dev