Merge "PointerController: Add guards to ensure display is valid"