Merge "Add Null checks while processing pairing cancel intent" into mnc-dev