Merge "Add 4x4KiB heap and make app critical" into main