Merge "Refactor of PointerController"