Merge "Simplify OverviewActionsView layout to avoid unexpected misalignemnt" into main