Merge "Merge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev am: f8cb5482c8 am: 8529200aa3"