Merge "Fix boundary condition of showing quickscrub tip after dismissal." into pi-dev
am: 0726f5c82a

Change-Id: I10f9bd7919f6d7cca4c3972145334b4aac939563