Merge "Prevent NPE in ControlsListingControllerImpl" into rvc-dev am: 976c089f am: eba46a76 am: e7a8dad0 am: 3a6c5527 Change-Id: Iaf525fd7d60e7a7a7960ba8c8cc7f10eb1e02ccf