View is now re-used within the same activity
Merge branch 'feature/view-reuse' into develop

* feature/view-reuse:
  View is now re-used within the same activity