Merge "Respect relative layer value if in tree when screenshotting." into pi-dev am: d893c33303
am: 7c4a97b422

Change-Id: I36a780b7bdf1781edf59c6678559fe7328abb456