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

Change-Id: Ifcde7fa530cbdac037d068342a72bdff765a6a63