And make sure to check for a nullptr xController
in GetBitmapForCommand.

Change-Id: Ib62bc06d0708847cfec54a71209cf68a4c32a50d