Merge "Remove disruptive home screen announcement when scrolling" into main