mms: Fix NPE when attaching slides

Issue: BACON-908

Change-Id: I7cc2fa975852cb08612849266529ee8aaf25b071
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0