Merge "Shade: Hide status icons, take 2." into lmp-dev