Merge "Move edit button next to page dots"