Merge "Fix widget manager / alarm manager deadlock" into pi-dev