Merge commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391' * commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391': Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
Merge commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391' * commit '131c5e0867d542788cf2dab23b17f2f8cc3d0391': Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.