Merge "WindowManager: improve focused app tracing"