Merge "Use smoothstep to eliminate branches in AA shader" into jb-mr1-dev