Updated patchsets for Custom Navigation Ring

Change-Id: Iac05f460f72d3a989683b2c8ff6856a67d8bda1b