Merge "MediaSessionManager: Use Executor instead of Handler"