Merge "Fix issue #22531747: Assist info should declare if user has disabled..." into mnc-dev