Merge "Make MediaPlaylistAgent updatable" into pi-dev