Merge "Temporarily increase sched policy for dozing" into sc-dev