DeskClock: Make settings consistent

* Move status bar icon setting to the bottom
* Match volume button summary with shake/flip actions
* Match shake/flip actions popup with volume buttons popup setting
* Make dialog titles consistent

Change-Id: If9000bc843b0feeab40118ee00bd61fbcddf4e9a
Merge remote-tracking branch 'cm/cm-12.0' into HEAD