Merge "Improve Visibility parent value check." into lmp-dev