Merge remote-tracking branch 'upstream/master' into sprint/FunnyFrog.fix.infinite-scroll-issues-on-notifications-page
