Merge "Explicitly set Settings background to white" into lmp-dev