Merge "Add setAllowedActivities/setBlockActivities implementation"