Merge "Prevents QS Header info clicks when it's hidden" into qt-dev
am: 330279c7f1

Change-Id: I6dc0faf906c4b57531632fbc68fe927cac98698e