Merge "Add HWC 1.4 with support for sideband video layers"