Revert "Use the same properties in showcaseview"

This reverts commit 89b5653b322534449d64006c4861bc85be086cd5.
Merge branch 'release' into upstream