Merge "Refactor KeygaurdController using state machine"