Merge "Add device details more settings page" into main