Merge "Disable emergency dialer shortcuts feature" into pi-dev