Merge "Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev am: dad0ba155e am: cc78864bb7  -s ours"