am 8cbc37f2: am 8e2fcaa3: Merge "Use FrameLayout for the backing view" into lmp-dev

* commit '8cbc37f2c803fe5854237434742845a7b8ee32b9':
  Use FrameLayout for the backing view