Merge "Adjust edit shortcuts page to display button & gesture" into main