Merge "Fix order of buttons for device admin toggle"