Merge "Hide work messages even when main user isn't secure"