Merge "Deprecate the LocalBroadcastManager" into pi-dev