Fix for weird storyboard inconsistency.

Change-Id: I908804bc422d9daa31c799869546fe94d3367fcd