Merge "[diskselector] for dynamic theme change"