Merge "Always enable DPMS lock check" into qt-dev