Merge "Add static-threshold skipping in non-rd mode"