Merge "Merge "Fix TaskView is invisible during quick switch" into rvc-dev am: b2014a0a am: c6b0bfa4" into rvc-d1-dev-plus-aosp