Merge "Fix refresh issue in the resource chooser"