Merge changes I2b6bfca0,I9a854d43

* changes:
  Add option to retrieve pending intent result
  Fix issue with permission check for shortcuts and pendingIntent