Merge "Put canvas on a layer" into ics-mr1