Merge "Make ScrimController Injectable."