Merge "SystemUI: Reset the cache state when registering the listener" into r-keystone-qcom-dev