Fixed missing empty view crash from tablet
Merge branch 'dev' into add-new-expansion-icons
Updateing changelog