Merge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev