Merge "Fix NPE in accountPrefController"