Merge "Allow action visibility to be toggled." into main