Merge "Unregister broadcast receiver when user removed" into main