Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev