am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in...
am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev
* commit 'd93421b1':
Remove scroll view from correct parent in AlertController