Merge "Add help button on the top right corner of more settings page" into main