Merge "Drop context on hidden"