HeadsUp: option to show at the bottom of the screen (2/2)
Merge branch 'kk-WIP-cp' into kitkat