Merge "Add Keyguard DPM state change callback" into tm-dev