Merge "SF: Don't cache display modes in HWComposer" into sc-dev