Merge "Remove device settings button" into main