Merge "Fix DISABLE_EXPAND in the tablet status bar."