Merge "Power key behavior tweaks." into qt-dev