Merge "Fix broadcast receiver race condition"