Merge "Fix Settings crash due to Allow guest to use phone with guest user" into udc-qpr-dev