Code clean-up in constraint layout

Vivide-mt.418