Revert "Revert "Merge pull request #1266 from enyojs/LEX-BHV-3479""

This reverts commit 6e8bfbc6b3c1f3485ca605086a32ba2146287fbc.

There was a workaround for the regression that did not involve any additional changes to Moonstone (only in Spotlight), so we are reverting the reversion.