Merge "Fix 6516240: Remove unused bottom margins from owner info textview" into jb-dev