Merge "Reset the clearAllInProgress flag when the shade is collapsed" into udc-dev