Merge "USB debug dialog won't give permission if obscured." into oc-mr1-dev