Merge "Usage Settings: Fix NPE when subscriberId is Null." into sc-dev