Merge "AdapterProperties: Guard unregisterReceiver"