US804 - Fix button not displaying after back pressed
Merge branch 'development' into development-work