Make ViewScoped and UIScoped target methods as well (#12454)

Change-Id: Ic11abf3e99841f84793567082d590d9726de2fad