Improve ShowCaseView management
Revert "Improve ShowCaseView management"

This reverts commit a9b277d63f4b71e2210a32bb28e23b4e08566c84.
Revert "Revert "Improve ShowCaseView management""

This reverts commit dc03b0bda15e90ebd77ccb42a567a69e297756f6.
[Fix] Bad merge
Final merge