Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev