Merge "Mark framework created intent as safe"