Merge "Changed to use putLong() instead of putInt() for initialization of KEY_SUBSCRIBE_RETRY_DURATION_MILLIS_LONG)" into main