Merge "WM: Prevent unminimizing docked stack on AOD" into pi-dev