Merge "Revert "Do not acknowledge flush() on start() for static tracks"" into mnc-dr-dev