Merge "Add view based screenshot for remaining TTV UI states" into main