Fix display rotation settings not showing up properly
More clean up
Update values for nav reset (Aokp)