Merge pull request #1355 from abarth/current_state

Add a currentWidget and currentState accessor to GlobalKeys