Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev