Merge "pre-grant permssion for Messenger app" into oc-mr1-dev