Touch up toggle setup dialog

Be consistent with other dialogs in android and match their style,
also added a close button for a better UX

Change-Id: Ifca3c9456bd2c685d66a6a056fd8047752dc8d3b
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Merge "Touch up toggle setup dialog" into jb-mr1