Merge "Update HomeControlsRemoteService to cleanup callbacks on destroy" into main