HeadsUp: Fix dismiss on back key press.

Change-Id: Ia213aeba114d153f5561622a2bea884963f3d8a1
Merge remote branch 'cm/cm-11.0' into cm-11.0