sample_app changes
Merge branch 'master' into local
layout finish