Merge "NoSuchElementException handing in SystemRequestObserver" into main