Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev