Merge "support expanding advanced settings from intent extra"