Merge "Fix order-of-initialization problem with BroadcastReceiver" into lmp-dev