Merge "Don't check states when mActiveProfile is present" into honeycomb-mr1