Merge remote-tracking branch 'upstream/master' into sprint/GiddyGiraffe.fix.gathering-button-continues-pulsating-indefinitely
