Adding super awesome form context management

Change-Id: I545ddfe3e70f8d81203eac6652d3debf8cf2f682