Merge "Fix BroadcastReceiver leaked during user switching" into tm-dev