NavBar Ring Customizations [2/2]

Change-Id: Ia54bf00d42a7b8191924943ff0174909d350870a
Merge "NavBar Ring Customizations [2/2]" into du44