Fixes bug when updating ui without context
Merge "Fixes bug when updating ui without context"