Merge "Support showing alignment hint based on aligniment state of dock" into qt-qpr1-dev
am: fc3f1408da

Change-Id: I4b9b1fd4c3209a6e3ae42c65d0a2b4c8484fc8ba