Merge "Fix widget manager / alarm manager deadlock"