Merge "Add hidden flag for SysUI to control the return drag animation"