Merge "Fix NPE notifyActivityPinned"