Merge "Fix tests after device rename button is moved" into main