Merge "Change PointerController to display space"