[automerger skipped] Merge "DO NOT MERGE Fix Autohide functionality" into qt-qpr1-dev am: 2267cbc5 -s ours am: 14862018 Change-Id: I3a14b742eea6e4e87738dc03b8529b4a714f675f