am 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"

* commit '1ef6a106d50f6fce2e2a810075a55bb264fa5c23':
  Fix Settings app crash after enabled multi-user