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