Merge "Fix Certificate authority installed notification is gone when turning off and on the work mode." into nyc-dev