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

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