Fixes #280: Widgets disposed in deactivate 

Change-Id: I214e9bc70bc75d668d6756464933775c2fa3a1c8
Merge "Fixes #280: Widgets disposed in deactivate "