Merge "Store and log details for non-app visible windows" into main