Merge commit 'e2ab45972af13c30bb98848813313603670c8965' * commit 'e2ab45972af13c30bb98848813313603670c8965': Improve the add-device-admin layout.
Merge commit 'e2ab45972af13c30bb98848813313603670c8965' * commit 'e2ab45972af13c30bb98848813313603670c8965': Improve the add-device-admin layout.