Merge "Always report keyguard-going-away even if empty" into udc-dev