Merge "Use snapshot alpha in all layer drawing" into jb-mr2-dev