* commit '2b6be701a90a4f0aefefcf8e70feb04722e1bcfe': Fix bug 3312807 - Fix child margin measurement in FrameLayout