Merge "Fix widget manager / alarm manager deadlock" into pi-dev am: 77d59a2f6f
am: 46d28b0fbb

Change-Id: If17a1e6a094061069310f4140e915bc06bc96dd4