Merge "Add a LayerScreenshot" into ics-mr0