Merge "NIU Actions: Hide button captions when feature is disabled" into sc-dev