Merge "SAP: Mark the PendingIntents with FLAG_IMMUTABLE"