Merge "Prevent NPE in ControlsListingControllerImpl" into rvc-dev