Merge "Fix ClassCastException in WatchedIntentResolver" into sc-dev