am 9c9aec72: Merge "Fix issue #8311263: Corrupted UI across all tabs in People app" into jb-mr2-dev

* commit '9c9aec721a78f23b4315ac920c26b109999a07f1':
  Fix issue #8311263: Corrupted UI across all tabs in People app