Merge "Fix AlertDialog positioning for dialogs spawned from DialogWhenLarge activities" into jb-dev