Merge "Fix broken intent resolver and share sheet tests."