Merge branch 'filling-in-layout' of gitlab.zigexn.vn:phuongnhm/sample_app into filling-in-layout

Status Job ID Name Coverage
  Build
canceled #3686
build

 
  Test
canceled #3688
allowed to fail
codequality

canceled #3687
test