Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev