Get account features before taking lock (cherry-pick from master)
am: fd24353d75

Change-Id: I4d89f492d4186f14516f93be800a6548127be921