[automerger skipped] Merge "Support showing alignment hint based on aligniment...

[automerger skipped] Merge "Support showing alignment hint based on aligniment state of dock" into qt-qpr1-dev am: fc3f1408
am: fe7f309f -s ours
am skip reason: change_id Ic0911683725a0e54406df06b948169c4dde94764 with SHA1 6a8fb02a is in history

Change-Id: Ic605312a95d1914a0e80d4ef8b64a9794b3b9684