Merge "Fix a regression in setting oom_adj for cached processes" into qt-dev