Merge "Fix blank confirm device credential activity" into mnc-dev