Merge "Fix regression in screen pinning action" into qt-dev
am: 33d0a2e971

Change-Id: I2e18e0b810d37dab3065d2e82fb8b1f00920b34d