* commit '58295e71d293c131508d280f1373d94716348b2e': Add Null checks while processing pairing cancel intent