Merge "Revert "Update ScreenshotRuleAsserter to support capturing a screenshot from a specified display ID"" into main