Merge "Use new API setAlwaysOn() for internal state management"