Merge "Fix NPE in NewReturnToCallController.createLettleTileDrawable()."