Merge "Update quick scrub tip according to the latest mock." into pi-dev