Merge "Reland "Change PointerController to display space""