Merge "Fixing user tap on suspended widget" into pi-dev