Fixing safe area grid issue
Merge branch 'master' of https://github.com/xtingray/tupi