Merge branches 'notifications', 'search_rebased' and 'playlists' into freeze-break