Merge "Prevent NPE in ControlsListingControllerImpl" into rvc-dev am: 976c089ff7 am: eba46a76ec am: 596845e012

Change-Id: Ic3a27e80b2a545ceeb5adec0abebd7eed6400911