[automerger skipped] Merge "DO NOT MERGE Fix Autohide functionality" into qt-qpr1-dev am: 2267cbc57f -s ours
am skip reason: subject contains skip directive

Change-Id: Ic96145923275d950d6f0a565f497b59cfa0ffd6c