Fake Cherry-pick TimeboxStoreyBar