Merge "Move mOnSubscriptionsChangeListener to FgThread" into main