Merge "Fix RTL for Nav icons" into oc-dr1-dev