Merge "Merge "Fixed that autoheads up were not visible or accidentally visible...

Merge "Merge "Fixed that autoheads up were not visible or accidentally visible at times" into qt-r1-dev am: 3721d7f8 am: 5abf5e1c" into qt-qpr1-dev-plus-aosp
am: 1a122c42

Change-Id: I423d607b598b5a54dafe782b53db61d8507b3cc8