Merge "Respect always unlocked displays when keyguard is shown." into udc-dev