Merge "Add OOME try catch around gc-thrash dive logic"