Merge "Settings: Introduce Substratum changes." into p9.0