Merge "Remove Oom Catcher" into qt-dev