Merge "Enabling HW detection while phone ringing"