Merge "Fix folder selection from widget."