Merge "SystemUI: Fix OnPreDrawListener leak issue" into q-keystone-qcom-dev