Merge "Cleanup flag "hide_restricted_actions"" into main