Merge "Playback resume after call" into pi-dev