Merge "Adding Requested Visible Types of WindowState to Winscope dump" into main