Merge "Revert "Fix recent apps in system UI for Skia pipeline"" into oc-dev