Merge "Keeping icons in disabled state when SD-card is unmounted" into ub-now-queens