Merge "Remove WindowManager usage in ViewConfiguration" into sc-v2-dev