Merge "Fix Settings app crash after enabled multi-user"