Merge "Add utility methods to AmbientDisplayConfig" into pi-dev