Merge "[Home Controls] Add null safety to comparator." into tm-qpr-dev