Change @UIScoped to @NormalScope instead of @Scope (#13330)

Change-Id: I644c34fab577ca243aaaccc461ede5c4b3c9031d