Merge "Initial implementation of IntentFirewall functionality" into jb-mr2-dev