* commit '0884f4030367eaad14cbd8114c88624286cb4cfe':
Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"
* commit '0884f4030367eaad14cbd8114c88624286cb4cfe':
Fix 6622557: Developer options "Show layout bounds" summary should say "margins" instead of "padding"