Merge "[Settings] Avoid access getSubscriberId()"