Fix use of item display context in Controller_G2 and Controller_ImageBlock.