am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev

* commit '92ade49ecaa23cd77510ee0bc1dbc6355eb581ed':
  Fix ActivityView layout bug.