Merge "Fix issue #22013372: Assist should take translationX and friends..." into mnc-dev