Merge "Fix boundary condition of showing quickscrub tip after dismissal." into pi-dev am: 0726f5c8 am: 453dfdf0 Change-Id: I80da12441b761a524971c58fcf1c9c222d879967