Merge "Restore ready apns once voice call ended" into jb-dev