Merge "Revert "Support showing alignment hint based on aligniment state of dock""