Merge "Add Cancel button in Car Keyguard" into pi-dev