Merge "Fixed an issue where the heads-up icon location was wrong" into pi-dev am: 194cca21b1
am: 15e5254040

Change-Id: Ic34a9d085ed49709e318ceffd52ad8c25be2ab9d