Merge "Remove UnsupportedAppUsage, use correct State* classes"