Merge "Add display compat system feature to PackageManager" into main