Merge "Fix activity interception bug"