Merge "swipe-back: disable background dimming on Dialog" into main