Merge "Tweak EJ & UI job thermal policy."