Highlight current sort option in navigation dropdown

Change-Id: I05e11f9a05f2fc476bb0dc4dcaca6aafee2750cd
Merge "Highlight current sort option in navigation dropdown"