Merge "Properly resume paused activity when docked stack in maximized" into nyc-dev