Merge "Check deferred overrides when querying compat fw"