Replace streaming library and last few app store changes