HALO clearall/silence (STILL NOT READY FOR RELEASE)

but working ...

Change-Id: Ie1c25f4ad60d2fac6321417c6fcf93e3dccd9d93
HALO clearall-fix + dismiss icon (READY, BUT NEW STYLE IS XHDPI ONLY!)

Change-Id: I5d47a2dda9139445503f4e93f9a72c02b48cb88d
Merge remote-tracking branch 'pa/jellybean' into jellybean-legacy