Merge "Fixed that autoheads up were not visible or accidentally visible at times" into qt-r1-dev
am: 3721d7f842

Change-Id: I939981b3852a2cb9a1bd3794815f8140c1cb6caf