Merge "Fix to clear calling identity when binding a widget."