Revert "SystemUI: improve one finger notification expansion"

This reverts commit d96f3fac697f8a5d91d76d974de41814a271a360.
Revert "HeadsUp: Fix dismiss on back key press."

This reverts commit fae7f3bdbb000a534f85064296322fd88a461541.