Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT"