Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev