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

Change-Id: Iea98ec2a030dd131e224faf73dad5923224cdfec