Merge "Check for null Drawable in MoveImage"