Merge "Fix app in size compat when it should not"