Merge branch 'default-shell-fix' into 'master'

This merge request resolves a few of the bugs and issues. See merge request hamara-developers/hamara-live-build!50
2 jobs from master in 16 minutes 35 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build Hamara Sugam Amd64
passed #1007
allowed to fail
build-hamara-sugam-amd64

08:32

 
  Build Hamara Sugam I386
passed #1008
build-hamara-sugam-i386

08:03