Merge "Update Consumer usages in WindowAreaComponentImpl" into tm-qpr-dev