Fixing badge view oversize in full screen
Merge branch 'full-screen-bugs'