Merge "Fixed an issue where heads up where invisible in qs edit" into oc-dev am: 4827cb08cc
am: d83911cb2c

Change-Id: If38662e5ab91b09bed4bfa4657e9e9eb1ad4e7be