Merge "Overlay Fix up telephony" into cm-11.0