Merge "Add back navigation ring customization." into cm-11.0