Merge "Support Settings deep links highlighting the menu entries"