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

Change-Id: I0dd06bb8c617c6553aaecec31918f3b2096d5a90