Merge "Use snapshot alpha for layers" into jb-mr2-dev