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

Change-Id: I3bbf2e2eb3882a8a13e456df1bf143cc823c8eec