Merge "Show scrim state on systraces"