Merge "Fix actionMenuTextAppearance on v21-22" into mnc-ub-dev