Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev