Merge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev