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