Merge "Fix regression in screen pinning action" into qt-dev