Merge "Fix systemui crash on Xoom startup"