Merge "Bool to note Pending Intent bug fixed"