Merge "Retain current visibility when copying layoutparam" into jb-dev