Merge pull request #455 from bhariharan/hybrid_fast_user

Hybrid fast user switching - FIRST PASS