Merge "Always clear settings when entering Inactive state." into honeycomb-LTE