Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"