am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE

* commit '1146bddf92fc91dad384bdaea740f9472bebd911':
  Always clear settings when entering Inactive state.