Merge "Mention <intent> can't have string resources." into oc-dev