Merge "Check user state after clearing identity." into mnc-dev