Merge "Remove a few unused header includes from PlaybackSession.cpp"