Merge "Supporting multi-display for takeScreenshot()" into rvc-dev am: aa8f5cb671

Change-Id: I03c220f6be59a041015f9959bb7905e7e328bf20