Merge "Fix passwords settings crash due to null lifecycle owner." into sc-dev