Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev