Merge "Don't yell when calling into SystemUI" into oc-dev