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

Change-Id: I98192a5fc9539512dc344d079925f77f97bb41d3