Cleaning up StackView

Change-Id: I38cd8a5f2d25973d3f97551be0a873ca35044ed9
5 files changed