Revert "Put canvas on a layer"

Bug: 5712065
This reverts commit 35e0b8dd7902e92f50ede4df2e4bad4ed581b770
2 files changed