Merge "Don't clear all of global stats when clearing layer stats." into sc-dev