Merge "DPM control for remote input when locked" into nyc-dev