Merge "Update the runner for systemui" into oc-dr1-dev