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

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