am 386c3120: am 56a22a55: Merge "Fix AlertDialog extending to screen width" into lmp-mr1-ub-dev

* commit '386c312035679515e8f3d2b179d259da3f6bc13b':
  Fix AlertDialog extending to screen width