Merge "Work on issue #130684057: oom_adj scores for 1P apps are abnormally low" into qt-dev