Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd" into oc-mr1-dev