Merge "Update min next page visible to 48dp" into main