Merge "Prevent NPE in ControlsListingControllerImpl" into rvc-dev am: 976c089f am: eba46a76 am: 596845e0 Change-Id: Ic3a27e80b2a545ceeb5adec0abebd7eed6400911