Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev