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

Change-Id: I63d390d1aabe29d9b5d88bd2e4a5752bf3252780