Merge "SF: Use compositionInfo after HWC changedTypes"