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