Merge "Use FrameLayout for the backing view" into lmp-dev