Merge "Rework NIU Actions buttons UI" into sc-dev