Merge NavRing : Fix FC on rotate into cm-10.1

Change-Id: I7e280bbaf10bb835e7113a7388ce0da5ce739575