Merge "browserIntent needs proper flags for PendingIntent" into oc-dev